auto upstream
authorJoakim Verona <joakim@verona.se>
Mon, 24 Dec 2012 23:06:10 +0000 (00:06 +0100)
committerJoakim Verona <joakim@verona.se>
Mon, 24 Dec 2012 23:06:10 +0000 (00:06 +0100)

Trivial merge